Skip to content

[Backport 2.x] Compress and cache cluster state during validate join request (#7321)#7945

Merged
andrross merged 2 commits intoopensearch-project:2.xfrom
andrross:backport/backport-7321-to-2.x
Jun 22, 2023
Merged

[Backport 2.x] Compress and cache cluster state during validate join request (#7321)#7945
andrross merged 2 commits intoopensearch-project:2.xfrom
andrross:backport/backport-7321-to-2.x

Conversation

@andrross
Copy link
Member

@andrross andrross commented Jun 6, 2023

Backports #7321 to 2.x

@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString

@codecov
Copy link

codecov bot commented Jun 6, 2023

Codecov Report

Merging #7945 (fb56099) into 2.x (efd12df) will decrease coverage by 0.07%.
The diff coverage is 87.93%.

❗ Current head fb56099 differs from pull request most recent head daeaa52. Consider uploading reports for the commit daeaa52 to get more accurate results

@@             Coverage Diff              @@
##                2.x    #7945      +/-   ##
============================================
- Coverage     70.64%   70.58%   -0.07%     
+ Complexity    56851    56780      -71     
============================================
  Files          4703     4704       +1     
  Lines        269104   269091      -13     
  Branches      39774    39771       -3     
============================================
- Hits         190118   189932     -186     
- Misses        62702    62833     +131     
- Partials      16284    16326      +42     
Impacted Files Coverage Δ
...g/opensearch/cluster/coordination/Coordinator.java 78.89% <ø> (+3.11%) ⬆️
...ch/cluster/coordination/CompressedStreamUtils.java 80.00% <80.00%> (ø)
...rg/opensearch/cluster/coordination/JoinHelper.java 84.72% <89.47%> (-0.84%) ⬇️
...ster/coordination/PublicationTransportHandler.java 85.18% <100.00%> (-0.68%) ⬇️

... and 452 files with indirect coverage changes

@andrross andrross force-pushed the backport/backport-7321-to-2.x branch from bcde254 to 91f9db9 Compare June 8, 2023 18:02
@github-actions
Copy link
Contributor

github-actions bot commented Jun 8, 2023

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal
Copy link
Member

@andrross Can you please rebase and iterate to green?

@andrross andrross force-pushed the backport/backport-7321-to-2.x branch from 91f9db9 to c785e9f Compare June 15, 2023 21:52
@andrross andrross requested a review from sachinpkale as a code owner June 15, 2023 21:52
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication

@andrross andrross force-pushed the backport/backport-7321-to-2.x branch from c785e9f to fb56099 Compare June 16, 2023 23:33
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testPressureServiceStats
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication

andrross added a commit to andrross/OpenSearch that referenced this pull request Jun 20, 2023
This change was backported to 2.x in opensearch-project#7945.

Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the backport/backport-7321-to-2.x branch from fb56099 to 0dfe96e Compare June 21, 2023 15:27
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@andrross
Copy link
Member Author

Flaky test: #7592

amkhar and others added 2 commits June 22, 2023 09:36
…arch-project#7321)

* Compress and cache cluster state during validate join request

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Add changelog and license

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Add javadoc and correct styling

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Add new handler for sending compressed cluster state in validate join flow and refactor code

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Refactor util method

Signed-off-by: Aman Khare <amkhar@amazon.com>

* optimize imports

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use cluster state version based cache instead of time based cache

Signed-off-by: Aman Khare <amkhar@amazon.com>

* style fix

Signed-off-by: Aman Khare <amkhar@amazon.com>

* fix styling 2

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use concurrent hashmap instead of cache, add UT class for ClusterStateUtils

Signed-off-by: Aman Khare <amkhar@amazon.com>

* style fix

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use AtomicReference instead of ConcurrentHashMap

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use method overloading to simplify the caller code

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Resolve conflicts

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Change code structure to separate the flow for JoinHelper and PublicationTransportHelper

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Remove unnecessary input.setVersion line

Co-authored-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Aman Khare <85096200+amkhar@users.noreply.github.com>

---------

Signed-off-by: Aman Khare <amkhar@amazon.com>
Signed-off-by: Aman Khare <85096200+amkhar@users.noreply.github.com>
Co-authored-by: Aman Khare <amkhar@amazon.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit b17c88c)
Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the backport/backport-7321-to-2.x branch from 0dfe96e to daeaa52 Compare June 22, 2023 16:37
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testPressureServiceStats

@andrross andrross merged commit 4b3b30d into opensearch-project:2.x Jun 22, 2023
andrross added a commit to andrross/OpenSearch that referenced this pull request Jun 22, 2023
This change was backported to 2.x in opensearch-project#7945.

Signed-off-by: Andrew Ross <andrross@amazon.com>
kotwanikunal pushed a commit that referenced this pull request Jun 22, 2023
This change was backported to 2.x in #7945.

Signed-off-by: Andrew Ross <andrross@amazon.com>
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 26, 2023
…request (opensearch-project#7321) (opensearch-project#7945)

* Compress and cache cluster state during validate join request (opensearch-project#7321)

* Compress and cache cluster state during validate join request

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Add changelog and license

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Add javadoc and correct styling

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Add new handler for sending compressed cluster state in validate join flow and refactor code

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Refactor util method

Signed-off-by: Aman Khare <amkhar@amazon.com>

* optimize imports

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use cluster state version based cache instead of time based cache

Signed-off-by: Aman Khare <amkhar@amazon.com>

* style fix

Signed-off-by: Aman Khare <amkhar@amazon.com>

* fix styling 2

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use concurrent hashmap instead of cache, add UT class for ClusterStateUtils

Signed-off-by: Aman Khare <amkhar@amazon.com>

* style fix

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use AtomicReference instead of ConcurrentHashMap

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Use method overloading to simplify the caller code

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Resolve conflicts

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Change code structure to separate the flow for JoinHelper and PublicationTransportHelper

Signed-off-by: Aman Khare <amkhar@amazon.com>

* Remove unnecessary input.setVersion line

Co-authored-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Aman Khare <85096200+amkhar@users.noreply.github.com>

---------

Signed-off-by: Aman Khare <amkhar@amazon.com>
Signed-off-by: Aman Khare <85096200+amkhar@users.noreply.github.com>
Co-authored-by: Aman Khare <amkhar@amazon.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit b17c88c)

* Change version guard to 2.9.0

Signed-off-by: Andrew Ross <andrross@amazon.com>

---------

Signed-off-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: Aman Khare <85096200+amkhar@users.noreply.github.com>
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jun 27, 2023
This change was backported to 2.x in opensearch-project#7945.

Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
sudarshan-baliga pushed a commit to Gaurav614/OpenSearch that referenced this pull request Jun 29, 2023
This change was backported to 2.x in opensearch-project#7945.

Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross deleted the backport/backport-7321-to-2.x branch February 8, 2024 19:47
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
This change was backported to 2.x in opensearch-project#7945.

Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants